Merge pull request #535 from dsander/fix-navigation-line-break
Fixed navigation bar when many events are pending
Dominik Sander
2 changed files with 10 additions and 5 deletions
+ 5
- 0
app/assets/stylesheets/application.css.scss.erb
@@ -86,6 +86,11 @@ span.not-applicable:after {
|
||
| 86 | 86 |
.nav > li {
|
| 87 | 87 |
&.job-indicator, &#event-indicator {
|
| 88 | 88 |
display: none; |
| 89 |
+ |
|
| 90 |
+ a {
|
|
| 91 |
+ padding-right: 5px; |
|
| 92 |
+ padding-left: 5px; |
|
| 93 |
+ } |
|
| 89 | 94 |
} |
| 90 | 95 |
} |
| 91 | 96 |
|
+ 5
- 5
app/views/layouts/_navigation.html.erb
@@ -28,29 +28,29 @@ |
||
| 28 | 28 |
|
| 29 | 29 |
<ul class="nav navbar-nav navbar-right"> |
| 30 | 30 |
<% if user_signed_in? %> |
| 31 |
- <form class="navbar-form navbar-left" role="search"> |
|
| 31 |
+ <form class="navbar-form navbar-left visible-lg" role="search"> |
|
| 32 | 32 |
<div class="form-group"> |
| 33 | 33 |
<input type="text" class="form-control" id='agent-navigate' autocomplete="off" placeholder="Search"> |
| 34 | 34 |
<%= image_tag "spinner-arrows.gif", :class => "spinner" %> |
| 35 | 35 |
</div> |
| 36 | 36 |
</form> |
| 37 | 37 |
|
| 38 |
- <li class='job-indicator' role='pending'> |
|
| 38 |
+ <li class='job-indicator visible-lg' role='pending'> |
|
| 39 | 39 |
<%= link_to current_user.admin? ? jobs_path : '#' do %> |
| 40 | 40 |
<span class="badge"><span class="glyphicon glyphicon-refresh icon-white"></span> <span class='number'>0</span></span> |
| 41 | 41 |
<% end %> |
| 42 | 42 |
</li> |
| 43 |
- <li class='job-indicator' role='awaiting_retry'> |
|
| 43 |
+ <li class='job-indicator visible-lg' role='awaiting_retry'> |
|
| 44 | 44 |
<%= link_to current_user.admin? ? jobs_path : '#' do %> |
| 45 | 45 |
<span class="badge"><span class="glyphicon glyphicon-question-sign icon-yellow"></span> <span class='number'>0</span></span> |
| 46 | 46 |
<% end %> |
| 47 | 47 |
</li> |
| 48 |
- <li class='job-indicator' role='recent_failures'> |
|
| 48 |
+ <li class='job-indicator hidden-sm hidden-xs' role='recent_failures'> |
|
| 49 | 49 |
<%= link_to current_user.admin? ? jobs_path : '#' do %> |
| 50 | 50 |
<span class="badge"><span class="glyphicon glyphicon-exclamation-sign icon-white"></span> <span class='number'>0</span></span> |
| 51 | 51 |
<% end %> |
| 52 | 52 |
</li> |
| 53 |
- <li id='event-indicator'> |
|
| 53 |
+ <li id='event-indicator' class='hidden-sm hidden-xs'> |
|
| 54 | 54 |
<a href="#"> |
| 55 | 55 |
<span class="badge"><span class="glyphicon glyphicon-random icon-white"></span> <span class='number'>0</span> new events</span> |
| 56 | 56 |
</a> |